$OpenBSD: patch-list_h,v 1.1 2012/05/09 21:27:47 sthen Exp $
--- list.h.orig	Thu Apr 19 13:10:03 2012
+++ list.h	Wed May  9 18:06:33 2012
@@ -33,6 +33,8 @@
 #ifndef _SER_LIST_H
 #define	_SER_LIST_H
 
+#include <sys/queue.h>
+
 /* #include <sys/cdefs.h> - not needed and not present on all the systems */
 
 /*
@@ -133,6 +135,7 @@ struct qm_trace {
 #define	TRASHIT(x)
 #endif	/* QUEUE_MACRO_DEBUG */
 
+#ifndef SLIST_HEAD
 /*
  * Singly-linked List declarations.
  */
@@ -205,6 +208,8 @@ struct {								\
 	SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field);	\
 } while (0)
 
+#endif /* SLIST_HEAD */
+
 /*
  * Singly-linked Tail queue declarations.
  */
@@ -300,6 +305,7 @@ struct {								\
 		(head)->stqh_last = &STAILQ_FIRST((head));		\
 } while (0)
 
+#ifndef LIST_HEAD
 /*
  * List declarations.
  */
@@ -513,5 +519,6 @@ struct {								\
 	TRASHIT((elm)->field.tqe_prev);					\
 	QMD_TRACE_ELEM(&(elm)->field);					\
 } while (0)
+#endif /* LIST_HEAD */
 
 #endif /* !_LIST_H */
